From b0e0fbe21f2e4edd469a89f389b451380a2277bf Mon Sep 17 00:00:00 2001 From: "iap10@freefall.cl.cam.ac.uk" Date: Fri, 20 May 2005 21:45:25 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.146 (428e5a750X0LdGym7H2kz7FPjJu-mw) Upgrade to linux 2.4.30 Signed-off-by: ian@xensource.com --- .rootkeys | 168 +++++++++--------- .../Makefile | 2 +- .../arch/xen/Makefile | 0 .../arch/xen/boot/Makefile | 0 .../arch/xen/config.in | 0 .../arch/xen/defconfig-xen0 | 45 +---- .../arch/xen/defconfig-xenU | 1 + .../arch/xen/drivers/balloon/Makefile | 0 .../arch/xen/drivers/blkif/Makefile | 0 .../arch/xen/drivers/blkif/backend/Makefile | 0 .../arch/xen/drivers/blkif/frontend/Makefile | 0 .../arch/xen/drivers/blkif/frontend/common.h | 0 .../arch/xen/drivers/blkif/frontend/vbd.c | 0 .../arch/xen/drivers/console/Makefile | 0 .../arch/xen/drivers/dom0/Makefile | 0 .../arch/xen/drivers/evtchn/Makefile | 0 .../arch/xen/drivers/netif/Makefile | 0 .../arch/xen/drivers/netif/backend/Makefile | 0 .../arch/xen/drivers/netif/frontend/Makefile | 0 .../arch/xen/kernel/Makefile | 0 .../arch/xen/kernel/entry.S | 0 .../arch/xen/kernel/head.S | 0 .../arch/xen/kernel/i386_ksyms.c | 0 .../arch/xen/kernel/irq.c | 0 .../arch/xen/kernel/ldt.c | 0 .../arch/xen/kernel/pci-pc.c | 0 .../arch/xen/kernel/process.c | 0 .../arch/xen/kernel/setup.c | 0 .../arch/xen/kernel/signal.c | 0 .../arch/xen/kernel/time.c | 0 .../arch/xen/kernel/traps.c | 0 .../arch/xen/lib/Makefile | 0 .../arch/xen/lib/delay.c | 0 .../arch/xen/mm/Makefile | 0 .../arch/xen/mm/fault.c | 0 .../arch/xen/mm/init.c | 0 .../arch/xen/mm/ioremap.c | 0 .../arch/xen/vmlinux.lds | 0 .../drivers/block/ll_rw_blk.c | 0 .../drivers/char/Makefile | 0 .../drivers/char/mem.c | 0 .../drivers/char/tty_io.c | 0 .../drivers/scsi/aic7xxx/Makefile | 0 .../fs/exec.c | 0 .../include/asm-xen/bugs.h | 0 .../include/asm-xen/desc.h | 0 .../include/asm-xen/fixmap.h | 0 .../include/asm-xen/highmem.h | 0 .../include/asm-xen/hw_irq.h | 0 .../include/asm-xen/io.h | 0 .../include/asm-xen/irq.h | 0 .../include/asm-xen/keyboard.h | 0 .../include/asm-xen/mmu_context.h | 0 .../include/asm-xen/module.h | 0 .../include/asm-xen/msr.h | 0 .../include/asm-xen/page.h | 0 .../include/asm-xen/pci.h | 0 .../include/asm-xen/pgalloc.h | 0 .../include/asm-xen/pgtable-2level.h | 0 .../include/asm-xen/pgtable.h | 0 .../include/asm-xen/processor.h | 0 .../include/asm-xen/queues.h | 0 .../include/asm-xen/segment.h | 0 .../include/asm-xen/smp.h | 0 .../include/asm-xen/system.h | 0 .../include/asm-xen/vga.h | 0 .../include/asm-xen/xor.h | 0 .../include/linux/blk.h | 0 .../include/linux/highmem.h | 0 .../include/linux/irq.h | 0 .../include/linux/mm.h | 0 .../include/linux/sched.h | 0 .../include/linux/skbuff.h | 14 +- .../include/linux/timer.h | 0 .../kernel/time.c | 0 .../kernel/timer.c | 0 .../mkbuildtree | 0 .../mm/highmem.c | 0 .../mm/memory.c | 8 +- .../mm/mprotect.c | 0 .../mm/mremap.c | 0 .../mm/page_alloc.c | 2 +- .../mm/swapfile.c | 6 +- .../mm/vmalloc.c | 0 .../net/core/skbuff.c | 0 85 files changed, 108 insertions(+), 138 deletions(-) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/Makefile (99%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/boot/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/config.in (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/defconfig-xen0 (97%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/defconfig-xenU (99%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/balloon/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/blkif/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/blkif/backend/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/blkif/frontend/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/blkif/frontend/common.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/blkif/frontend/vbd.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/console/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/dom0/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/evtchn/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/netif/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/netif/backend/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/drivers/netif/frontend/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/entry.S (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/head.S (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/i386_ksyms.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/irq.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/ldt.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/pci-pc.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/process.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/setup.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/signal.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/time.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/kernel/traps.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/lib/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/lib/delay.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/mm/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/mm/fault.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/mm/init.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/mm/ioremap.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/arch/xen/vmlinux.lds (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/drivers/block/ll_rw_blk.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/drivers/char/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/drivers/char/mem.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/drivers/char/tty_io.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/drivers/scsi/aic7xxx/Makefile (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/fs/exec.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/bugs.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/desc.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/fixmap.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/highmem.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/hw_irq.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/io.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/irq.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/keyboard.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/mmu_context.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/module.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/msr.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/page.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/pci.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/pgalloc.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/pgtable-2level.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/pgtable.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/processor.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/queues.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/segment.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/smp.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/system.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/vga.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/asm-xen/xor.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/linux/blk.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/linux/highmem.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/linux/irq.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/linux/mm.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/linux/sched.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/linux/skbuff.h (99%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/include/linux/timer.h (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/kernel/time.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/kernel/timer.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mkbuildtree (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mm/highmem.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mm/memory.c (99%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mm/mprotect.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mm/mremap.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mm/page_alloc.c (99%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mm/swapfile.c (99%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/mm/vmalloc.c (100%) rename {linux-2.4.29-xen-sparse => linux-2.4.30-xen-sparse}/net/core/skbuff.c (100%) diff --git a/.rootkeys b/.rootkeys index d41e867182..a58821cd0c 100644 --- a/.rootkeys +++ b/.rootkeys @@ -117,90 +117,90 @@ 423e7e8dVDL1WLfbmQWuXMbetYk4jA freebsd-5.3-xen-sparse/mkbuildtree 423e7e8dBrOrAbydK6h49bY0VvDgPw freebsd-5.3-xen-sparse/xenfbsd_kernel_build 4187ca95_eQN62ugV1zliQcfzXrHnw install.sh -3e5a4e6589G-U42lFKs43plskXoFxQ linux-2.4.29-xen-sparse/Makefile -3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg linux-2.4.29-xen-sparse/arch/xen/Makefile -3e5a4e65n-KhsEAs-A4ULiStBp-r6w linux-2.4.29-xen-sparse/arch/xen/boot/Makefile -3e5a4e65OV_j_DBtjzt5vej771AJsA linux-2.4.29-xen-sparse/arch/xen/config.in -40648526SxcA4lGIHB_k7ID8VlRSzw linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 -40c73c77QesbL7eIvG-fJGAtVwhGRg linux-2.4.29-xen-sparse/arch/xen/defconfig-xenU -3e6377f5xwPfYZkPHPrDbEq1PRN7uQ linux-2.4.29-xen-sparse/arch/xen/drivers/balloon/Makefile -4083dc16z0jvZEH4PiVDbDRreaNp6w linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/Makefile -4083dc16KQus88a4U3uCV6qVCA6_8Q linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/backend/Makefile -4075806dI5kfeMD5RV-DA0PYoThx_w linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile -4075806d4-j7vN0Mn0bklI1cRUX1vQ linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h -4075806dibjCcfuXv6CINMhxWTw3jQ linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c -3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ linux-2.4.29-xen-sparse/arch/xen/drivers/console/Makefile -3e5a4e656nfFISThfbyXQOA6HN6YHw linux-2.4.29-xen-sparse/arch/xen/drivers/dom0/Makefile -40420a6ebRqDjufoN1WSJvolEW2Wjw linux-2.4.29-xen-sparse/arch/xen/drivers/evtchn/Makefile -4083dc16-Kd5y9psK_yk161sme5j5Q linux-2.4.29-xen-sparse/arch/xen/drivers/netif/Makefile -4083dc16UmHXxS9g_UFVnkUpN-oP2Q linux-2.4.29-xen-sparse/arch/xen/drivers/netif/backend/Makefile -405853f2wg7JXZJNltspMwOZJklxgw linux-2.4.29-xen-sparse/arch/xen/drivers/netif/frontend/Makefile -3e5a4e65lWzkiPXsZdzPt2RNnJGG1g linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile -3e5a4e65_hqfuxtGG8IUy6wRM86Ecg linux-2.4.29-xen-sparse/arch/xen/kernel/entry.S -3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg linux-2.4.29-xen-sparse/arch/xen/kernel/head.S -3e5a4e65RMGcuA-HCn3-wNx3fFQwdg linux-2.4.29-xen-sparse/arch/xen/kernel/i386_ksyms.c -3e5a4e653U6cELGv528IxOLHvCq8iA linux-2.4.29-xen-sparse/arch/xen/kernel/irq.c -3e5a4e65muT6SU3ck47IP87Q7Ti5hA linux-2.4.29-xen-sparse/arch/xen/kernel/ldt.c -4051db95N9N99FjsRwi49YKUNHWI8A linux-2.4.29-xen-sparse/arch/xen/kernel/pci-pc.c -3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ linux-2.4.29-xen-sparse/arch/xen/kernel/process.c -3e5a4e66tR-qJMLj3MppcKqmvuI2XQ linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c -3e5a4e66fWSTagLGU2P8BGFGRjhDiw linux-2.4.29-xen-sparse/arch/xen/kernel/signal.c -3e5a4e66N__lUXNwzQ-eADRzK9LXuQ linux-2.4.29-xen-sparse/arch/xen/kernel/time.c -3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ linux-2.4.29-xen-sparse/arch/xen/kernel/traps.c -3e5a4e66-9_NczrVMbuQkoSLyXckIw linux-2.4.29-xen-sparse/arch/xen/lib/Makefile -3e5a4e6637ZDk0BvFEC-aFQs599-ng linux-2.4.29-xen-sparse/arch/xen/lib/delay.c -3e5a4e66croVgpcJyJuF2ycQw0HuJw linux-2.4.29-xen-sparse/arch/xen/mm/Makefile -3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg linux-2.4.29-xen-sparse/arch/xen/mm/fault.c -3e5a4e661gLzzff25pJooKIIWe7IWg linux-2.4.29-xen-sparse/arch/xen/mm/init.c -3f0bed43UUdQichXAiVNrjV-y2Kzcg linux-2.4.29-xen-sparse/arch/xen/mm/ioremap.c -3e5a4e66qRlSTcjafidMB6ulECADvg linux-2.4.29-xen-sparse/arch/xen/vmlinux.lds -3e5a4e66mrtlmV75L1tjKDg8RaM5gA linux-2.4.29-xen-sparse/drivers/block/ll_rw_blk.c -40d70c24-Dy2HUMrwSZagfXvAPnI4w linux-2.4.29-xen-sparse/drivers/char/Makefile -3f108aeaLcGDgQdFAANLTUEid0a05w linux-2.4.29-xen-sparse/drivers/char/mem.c -3e5a4e66rw65CxyolW9PKz4GG42RcA linux-2.4.29-xen-sparse/drivers/char/tty_io.c -40c9c0c1pPwYE3-4i-oI3ubUu7UgvQ linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile -3e5a4e669uzIE54VwucPYtGwXLAbzA linux-2.4.29-xen-sparse/fs/exec.c -3e5a4e66wbeCpsJgVf_U8Jde-CNcsA linux-2.4.29-xen-sparse/include/asm-xen/bugs.h -3e5a4e66HdSkvIV6SJ1evG_xmTmXHA linux-2.4.29-xen-sparse/include/asm-xen/desc.h -3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw linux-2.4.29-xen-sparse/include/asm-xen/fixmap.h -406aeeaaQvl4RNtmd9hDEugBURbFpQ linux-2.4.29-xen-sparse/include/asm-xen/highmem.h -3e5a4e67YtcyDLQsShhCfQwPSELfvA linux-2.4.29-xen-sparse/include/asm-xen/hw_irq.h -4060044fVx7-tokvNLKBf_6qBB4lqQ linux-2.4.29-xen-sparse/include/asm-xen/io.h -3e5a4e673p7PEOyHFm3nHkYX6HQYBg linux-2.4.29-xen-sparse/include/asm-xen/irq.h -40d70c240tW7TWArl1VUgIFH2nVO1A linux-2.4.29-xen-sparse/include/asm-xen/keyboard.h -3e5a4e678ddsQOpbSiRdy1GRcDc9WA linux-2.4.29-xen-sparse/include/asm-xen/mmu_context.h -40d06e5b2YWInUX1Xv9amVANwd_2Xg linux-2.4.29-xen-sparse/include/asm-xen/module.h -3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ linux-2.4.29-xen-sparse/include/asm-xen/msr.h -3e5a4e67mnQfh-R8KcQCaVo2Oho6yg linux-2.4.29-xen-sparse/include/asm-xen/page.h -409ba2e7ZfV5hqTvIzxLtpClnxtIzg linux-2.4.29-xen-sparse/include/asm-xen/pci.h -3e5a4e67uTYU5oEnIDjxuaez8njjqg linux-2.4.29-xen-sparse/include/asm-xen/pgalloc.h -3e5a4e67X7JyupgdYkgDX19Huj2sAw linux-2.4.29-xen-sparse/include/asm-xen/pgtable-2level.h -3e5a4e67gr4NLGtQ5CvSLimMYZlkOA linux-2.4.29-xen-sparse/include/asm-xen/pgtable.h -3e5a4e676uK4xErTBDH6XJREn9LSyg linux-2.4.29-xen-sparse/include/asm-xen/processor.h -41224663YBCUMX1kVo_HRUtgaHTi7w linux-2.4.29-xen-sparse/include/asm-xen/queues.h -3e5a4e68uJz-xI0IBVMD7xRLQKJDFg linux-2.4.29-xen-sparse/include/asm-xen/segment.h -3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA linux-2.4.29-xen-sparse/include/asm-xen/smp.h -3e5a4e68mTr0zcp9SXDbnd-XLrrfxw linux-2.4.29-xen-sparse/include/asm-xen/system.h -3f1056a9L_kqHcFheV00KbKBzv9j5w linux-2.4.29-xen-sparse/include/asm-xen/vga.h -40659defgWA92arexpMGn8X3QMDj3w linux-2.4.29-xen-sparse/include/asm-xen/xor.h -3f056927gMHl7mWB89rb73JahbhQIA linux-2.4.29-xen-sparse/include/linux/blk.h -42305f54mFScQCttpj57EIm60BnxIg linux-2.4.29-xen-sparse/include/linux/highmem.h -419e0488SBzS3mdUhwgsES5a5e3abA linux-2.4.29-xen-sparse/include/linux/irq.h -4124f66fPHG6yvB_vXmesjvzrJ3yMg linux-2.4.29-xen-sparse/include/linux/mm.h -401c0590D_kwJDU59X8NyvqSv_Cl2A linux-2.4.29-xen-sparse/include/linux/sched.h -40a248afgI0_JKthdYAe8beVfXSTpQ linux-2.4.29-xen-sparse/include/linux/skbuff.h -401c0592pLrp_aCbQRo9GXiYQQaVVA linux-2.4.29-xen-sparse/include/linux/timer.h -3f9d4b44247udoqWEgFkaHiWv6Uvyg linux-2.4.29-xen-sparse/kernel/time.c -401c059bjLBFYHRD4Py2uM3eA1D4zQ linux-2.4.29-xen-sparse/kernel/timer.c -3e6e7c1efbQe93xCvOpOVCnXTMmQ5w linux-2.4.29-xen-sparse/mkbuildtree -406aeeafkrnCuIVWLFv3kfn4uAD5Eg linux-2.4.29-xen-sparse/mm/highmem.c -3e5a4e68GxCIaFH4sy01v1wjapetaA linux-2.4.29-xen-sparse/mm/memory.c -3f108af5VxPkLv13tXpXgoRKALQtXQ linux-2.4.29-xen-sparse/mm/mprotect.c -3e5a4e681xMPdF9xCMwpyfuYMySU5g linux-2.4.29-xen-sparse/mm/mremap.c -409ba2e7akOFqQUg6Qyg2s28xcXiMg linux-2.4.29-xen-sparse/mm/page_alloc.c -3e5a4e683HKVU-sxtagrDasRB8eBVw linux-2.4.29-xen-sparse/mm/swapfile.c -41180721bNns9Na7w1nJ0ZVt8bhUNA linux-2.4.29-xen-sparse/mm/vmalloc.c -41505c57WAd5l1rlfCLNSCpx9J13vA linux-2.4.29-xen-sparse/net/core/skbuff.c +3e5a4e6589G-U42lFKs43plskXoFxQ linux-2.4.30-xen-sparse/Makefile +3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg linux-2.4.30-xen-sparse/arch/xen/Makefile +3e5a4e65n-KhsEAs-A4ULiStBp-r6w linux-2.4.30-xen-sparse/arch/xen/boot/Makefile +3e5a4e65OV_j_DBtjzt5vej771AJsA linux-2.4.30-xen-sparse/arch/xen/config.in +40648526SxcA4lGIHB_k7ID8VlRSzw linux-2.4.30-xen-sparse/arch/xen/defconfig-xen0 +40c73c77QesbL7eIvG-fJGAtVwhGRg linux-2.4.30-xen-sparse/arch/xen/defconfig-xenU +3e6377f5xwPfYZkPHPrDbEq1PRN7uQ linux-2.4.30-xen-sparse/arch/xen/drivers/balloon/Makefile +4083dc16z0jvZEH4PiVDbDRreaNp6w linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/Makefile +4083dc16KQus88a4U3uCV6qVCA6_8Q linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/backend/Makefile +4075806dI5kfeMD5RV-DA0PYoThx_w linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile +4075806d4-j7vN0Mn0bklI1cRUX1vQ linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/common.h +4075806dibjCcfuXv6CINMhxWTw3jQ linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c +3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ linux-2.4.30-xen-sparse/arch/xen/drivers/console/Makefile +3e5a4e656nfFISThfbyXQOA6HN6YHw linux-2.4.30-xen-sparse/arch/xen/drivers/dom0/Makefile +40420a6ebRqDjufoN1WSJvolEW2Wjw linux-2.4.30-xen-sparse/arch/xen/drivers/evtchn/Makefile +4083dc16-Kd5y9psK_yk161sme5j5Q linux-2.4.30-xen-sparse/arch/xen/drivers/netif/Makefile +4083dc16UmHXxS9g_UFVnkUpN-oP2Q linux-2.4.30-xen-sparse/arch/xen/drivers/netif/backend/Makefile +405853f2wg7JXZJNltspMwOZJklxgw linux-2.4.30-xen-sparse/arch/xen/drivers/netif/frontend/Makefile +3e5a4e65lWzkiPXsZdzPt2RNnJGG1g linux-2.4.30-xen-sparse/arch/xen/kernel/Makefile +3e5a4e65_hqfuxtGG8IUy6wRM86Ecg linux-2.4.30-xen-sparse/arch/xen/kernel/entry.S +3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg linux-2.4.30-xen-sparse/arch/xen/kernel/head.S +3e5a4e65RMGcuA-HCn3-wNx3fFQwdg linux-2.4.30-xen-sparse/arch/xen/kernel/i386_ksyms.c +3e5a4e653U6cELGv528IxOLHvCq8iA linux-2.4.30-xen-sparse/arch/xen/kernel/irq.c +3e5a4e65muT6SU3ck47IP87Q7Ti5hA linux-2.4.30-xen-sparse/arch/xen/kernel/ldt.c +4051db95N9N99FjsRwi49YKUNHWI8A linux-2.4.30-xen-sparse/arch/xen/kernel/pci-pc.c +3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ linux-2.4.30-xen-sparse/arch/xen/kernel/process.c +3e5a4e66tR-qJMLj3MppcKqmvuI2XQ linux-2.4.30-xen-sparse/arch/xen/kernel/setup.c +3e5a4e66fWSTagLGU2P8BGFGRjhDiw linux-2.4.30-xen-sparse/arch/xen/kernel/signal.c +3e5a4e66N__lUXNwzQ-eADRzK9LXuQ linux-2.4.30-xen-sparse/arch/xen/kernel/time.c +3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ linux-2.4.30-xen-sparse/arch/xen/kernel/traps.c +3e5a4e66-9_NczrVMbuQkoSLyXckIw linux-2.4.30-xen-sparse/arch/xen/lib/Makefile +3e5a4e6637ZDk0BvFEC-aFQs599-ng linux-2.4.30-xen-sparse/arch/xen/lib/delay.c +3e5a4e66croVgpcJyJuF2ycQw0HuJw linux-2.4.30-xen-sparse/arch/xen/mm/Makefile +3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg linux-2.4.30-xen-sparse/arch/xen/mm/fault.c +3e5a4e661gLzzff25pJooKIIWe7IWg linux-2.4.30-xen-sparse/arch/xen/mm/init.c +3f0bed43UUdQichXAiVNrjV-y2Kzcg linux-2.4.30-xen-sparse/arch/xen/mm/ioremap.c +3e5a4e66qRlSTcjafidMB6ulECADvg linux-2.4.30-xen-sparse/arch/xen/vmlinux.lds +3e5a4e66mrtlmV75L1tjKDg8RaM5gA linux-2.4.30-xen-sparse/drivers/block/ll_rw_blk.c +40d70c24-Dy2HUMrwSZagfXvAPnI4w linux-2.4.30-xen-sparse/drivers/char/Makefile +3f108aeaLcGDgQdFAANLTUEid0a05w linux-2.4.30-xen-sparse/drivers/char/mem.c +3e5a4e66rw65CxyolW9PKz4GG42RcA linux-2.4.30-xen-sparse/drivers/char/tty_io.c +40c9c0c1pPwYE3-4i-oI3ubUu7UgvQ linux-2.4.30-xen-sparse/drivers/scsi/aic7xxx/Makefile +3e5a4e669uzIE54VwucPYtGwXLAbzA linux-2.4.30-xen-sparse/fs/exec.c +3e5a4e66wbeCpsJgVf_U8Jde-CNcsA linux-2.4.30-xen-sparse/include/asm-xen/bugs.h +3e5a4e66HdSkvIV6SJ1evG_xmTmXHA linux-2.4.30-xen-sparse/include/asm-xen/desc.h +3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw linux-2.4.30-xen-sparse/include/asm-xen/fixmap.h +406aeeaaQvl4RNtmd9hDEugBURbFpQ linux-2.4.30-xen-sparse/include/asm-xen/highmem.h +3e5a4e67YtcyDLQsShhCfQwPSELfvA linux-2.4.30-xen-sparse/include/asm-xen/hw_irq.h +4060044fVx7-tokvNLKBf_6qBB4lqQ linux-2.4.30-xen-sparse/include/asm-xen/io.h +3e5a4e673p7PEOyHFm3nHkYX6HQYBg linux-2.4.30-xen-sparse/include/asm-xen/irq.h +40d70c240tW7TWArl1VUgIFH2nVO1A linux-2.4.30-xen-sparse/include/asm-xen/keyboard.h +3e5a4e678ddsQOpbSiRdy1GRcDc9WA linux-2.4.30-xen-sparse/include/asm-xen/mmu_context.h +40d06e5b2YWInUX1Xv9amVANwd_2Xg linux-2.4.30-xen-sparse/include/asm-xen/module.h +3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ linux-2.4.30-xen-sparse/include/asm-xen/msr.h +3e5a4e67mnQfh-R8KcQCaVo2Oho6yg linux-2.4.30-xen-sparse/include/asm-xen/page.h +409ba2e7ZfV5hqTvIzxLtpClnxtIzg linux-2.4.30-xen-sparse/include/asm-xen/pci.h +3e5a4e67uTYU5oEnIDjxuaez8njjqg linux-2.4.30-xen-sparse/include/asm-xen/pgalloc.h +3e5a4e67X7JyupgdYkgDX19Huj2sAw linux-2.4.30-xen-sparse/include/asm-xen/pgtable-2level.h +3e5a4e67gr4NLGtQ5CvSLimMYZlkOA linux-2.4.30-xen-sparse/include/asm-xen/pgtable.h +3e5a4e676uK4xErTBDH6XJREn9LSyg linux-2.4.30-xen-sparse/include/asm-xen/processor.h +41224663YBCUMX1kVo_HRUtgaHTi7w linux-2.4.30-xen-sparse/include/asm-xen/queues.h +3e5a4e68uJz-xI0IBVMD7xRLQKJDFg linux-2.4.30-xen-sparse/include/asm-xen/segment.h +3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA linux-2.4.30-xen-sparse/include/asm-xen/smp.h +3e5a4e68mTr0zcp9SXDbnd-XLrrfxw linux-2.4.30-xen-sparse/include/asm-xen/system.h +3f1056a9L_kqHcFheV00KbKBzv9j5w linux-2.4.30-xen-sparse/include/asm-xen/vga.h +40659defgWA92arexpMGn8X3QMDj3w linux-2.4.30-xen-sparse/include/asm-xen/xor.h +3f056927gMHl7mWB89rb73JahbhQIA linux-2.4.30-xen-sparse/include/linux/blk.h +42305f54mFScQCttpj57EIm60BnxIg linux-2.4.30-xen-sparse/include/linux/highmem.h +419e0488SBzS3mdUhwgsES5a5e3abA linux-2.4.30-xen-sparse/include/linux/irq.h +4124f66fPHG6yvB_vXmesjvzrJ3yMg linux-2.4.30-xen-sparse/include/linux/mm.h +401c0590D_kwJDU59X8NyvqSv_Cl2A linux-2.4.30-xen-sparse/include/linux/sched.h +40a248afgI0_JKthdYAe8beVfXSTpQ linux-2.4.30-xen-sparse/include/linux/skbuff.h +401c0592pLrp_aCbQRo9GXiYQQaVVA linux-2.4.30-xen-sparse/include/linux/timer.h +3f9d4b44247udoqWEgFkaHiWv6Uvyg linux-2.4.30-xen-sparse/kernel/time.c +401c059bjLBFYHRD4Py2uM3eA1D4zQ linux-2.4.30-xen-sparse/kernel/timer.c +3e6e7c1efbQe93xCvOpOVCnXTMmQ5w linux-2.4.30-xen-sparse/mkbuildtree +406aeeafkrnCuIVWLFv3kfn4uAD5Eg linux-2.4.30-xen-sparse/mm/highmem.c +3e5a4e68GxCIaFH4sy01v1wjapetaA linux-2.4.30-xen-sparse/mm/memory.c +3f108af5VxPkLv13tXpXgoRKALQtXQ linux-2.4.30-xen-sparse/mm/mprotect.c +3e5a4e681xMPdF9xCMwpyfuYMySU5g linux-2.4.30-xen-sparse/mm/mremap.c +409ba2e7akOFqQUg6Qyg2s28xcXiMg linux-2.4.30-xen-sparse/mm/page_alloc.c +3e5a4e683HKVU-sxtagrDasRB8eBVw linux-2.4.30-xen-sparse/mm/swapfile.c +41180721bNns9Na7w1nJ0ZVt8bhUNA linux-2.4.30-xen-sparse/mm/vmalloc.c +41505c57WAd5l1rlfCLNSCpx9J13vA linux-2.4.30-xen-sparse/net/core/skbuff.c 40f562372u3A7_kfbYYixPHJJxYUxA linux-2.6.11-xen-sparse/arch/xen/Kconfig 40f56237utH41NPukqHksuNf29IC9A linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers 40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.11-xen-sparse/arch/xen/Makefile diff --git a/linux-2.4.29-xen-sparse/Makefile b/linux-2.4.30-xen-sparse/Makefile similarity index 99% rename from linux-2.4.29-xen-sparse/Makefile rename to linux-2.4.30-xen-sparse/Makefile index 954de0b6d5..503ef53773 100644 --- a/linux-2.4.29-xen-sparse/Makefile +++ b/linux-2.4.30-xen-sparse/Makefile @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 4 -SUBLEVEL = 29 +SUBLEVEL = 30 EXTRAVERSION = KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) diff --git a/linux-2.4.29-xen-sparse/arch/xen/Makefile b/linux-2.4.30-xen-sparse/arch/xen/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/boot/Makefile b/linux-2.4.30-xen-sparse/arch/xen/boot/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/boot/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/boot/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/config.in b/linux-2.4.30-xen-sparse/arch/xen/config.in similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/config.in rename to linux-2.4.30-xen-sparse/arch/xen/config.in diff --git a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.30-xen-sparse/arch/xen/defconfig-xen0 similarity index 97% rename from linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 rename to linux-2.4.30-xen-sparse/arch/xen/defconfig-xen0 index 4769ac7822..f9d953db6d 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xen0 +++ b/linux-2.4.30-xen-sparse/arch/xen/defconfig-xen0 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_XEN=y CONFIG_X86=y @@ -128,14 +128,14 @@ CONFIG_BLK_DEV_INITRD=y # # Multi-device support (RAID and LVM) # -# CONFIG_MD is not set -# CONFIG_BLK_DEV_MD is not set -# CONFIG_MD_LINEAR is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=y # CONFIG_MD_RAID0 is not set -# CONFIG_MD_RAID1 is not set +CONFIG_MD_RAID1=y # CONFIG_MD_RAID5 is not set # CONFIG_MD_MULTIPATH is not set -# CONFIG_BLK_DEV_LVM is not set +CONFIG_BLK_DEV_LVM=y # # Networking options @@ -219,10 +219,6 @@ CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set CONFIG_VLAN_8021Q=y - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -274,10 +270,6 @@ CONFIG_IDE=y # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_IDE_SATA is not set @@ -291,10 +283,6 @@ CONFIG_BLK_DEV_IDETAPE=y CONFIG_BLK_DEV_IDEFLOPPY=y CONFIG_BLK_DEV_IDESCSI=y CONFIG_IDE_TASK_IOCTL=y - -# -# IDE chipset support/bugfixes -# CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_CMD640_ENHANCED=y # CONFIG_BLK_DEV_ISAPNP is not set @@ -338,10 +326,6 @@ CONFIG_BLK_DEV_SLC90E66=y CONFIG_BLK_DEV_TRM290=y CONFIG_BLK_DEV_VIA82CXXX=y CONFIG_IDE_CHIPSETS=y - -# -# Note: most of these also require special kernel boot parameters -# # CONFIG_BLK_DEV_4DRIVES is not set # CONFIG_BLK_DEV_ALI14XX is not set # CONFIG_BLK_DEV_DTC2278 is not set @@ -363,20 +347,12 @@ CONFIG_BLK_DEV_PDC202XX=y # SCSI support # CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set CONFIG_CHR_DEV_SG=y - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set @@ -419,6 +395,7 @@ CONFIG_SCSI_SATA=y # CONFIG_SCSI_SATA_SVW is not set CONFIG_SCSI_ATA_PIIX=y # CONFIG_SCSI_SATA_NV is not set +# CONFIG_SCSI_SATA_QSTOR is not set CONFIG_SCSI_SATA_PROMISE=y CONFIG_SCSI_SATA_SX4=y CONFIG_SCSI_SATA_SIL=y @@ -667,14 +644,6 @@ CONFIG_PSMOUSE=y # Joysticks # # CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# # CONFIG_QIC02_TAPE is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_PANIC_EVENT is not set diff --git a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.30-xen-sparse/arch/xen/defconfig-xenU similarity index 99% rename from linux-2.4.29-xen-sparse/arch/xen/defconfig-xenU rename to linux-2.4.30-xen-sparse/arch/xen/defconfig-xenU index 6527523b71..9678a2c3fc 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/defconfig-xenU +++ b/linux-2.4.30-xen-sparse/arch/xen/defconfig-xenU @@ -226,6 +226,7 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_SATA_SVW is not set # CONFIG_SCSI_ATA_PIIX is not set # CONFIG_SCSI_SATA_NV is not set +# CONFIG_SCSI_SATA_QSTOR is not set # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/balloon/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/balloon/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/balloon/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/balloon/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/backend/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/backend/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/backend/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/backend/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/common.h similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h rename to linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/common.h diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c b/linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c rename to linux-2.4.30-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/console/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/console/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/console/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/console/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/dom0/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/dom0/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/dom0/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/dom0/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/evtchn/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/evtchn/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/evtchn/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/evtchn/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/netif/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/netif/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/netif/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/netif/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/netif/backend/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/netif/backend/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/netif/backend/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/netif/backend/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/netif/frontend/Makefile b/linux-2.4.30-xen-sparse/arch/xen/drivers/netif/frontend/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/drivers/netif/frontend/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/drivers/netif/frontend/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile b/linux-2.4.30-xen-sparse/arch/xen/kernel/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/kernel/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/entry.S b/linux-2.4.30-xen-sparse/arch/xen/kernel/entry.S similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/entry.S rename to linux-2.4.30-xen-sparse/arch/xen/kernel/entry.S diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S b/linux-2.4.30-xen-sparse/arch/xen/kernel/head.S similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/head.S rename to linux-2.4.30-xen-sparse/arch/xen/kernel/head.S diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/i386_ksyms.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/i386_ksyms.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/i386_ksyms.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/i386_ksyms.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/irq.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/irq.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/irq.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/irq.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/ldt.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/ldt.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/ldt.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/ldt.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/pci-pc.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/pci-pc.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/pci-pc.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/pci-pc.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/process.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/process.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/process.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/process.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/setup.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/setup.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/signal.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/signal.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/signal.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/signal.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/time.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/time.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/time.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/time.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/traps.c b/linux-2.4.30-xen-sparse/arch/xen/kernel/traps.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/kernel/traps.c rename to linux-2.4.30-xen-sparse/arch/xen/kernel/traps.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/lib/Makefile b/linux-2.4.30-xen-sparse/arch/xen/lib/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/lib/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/lib/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/lib/delay.c b/linux-2.4.30-xen-sparse/arch/xen/lib/delay.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/lib/delay.c rename to linux-2.4.30-xen-sparse/arch/xen/lib/delay.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/mm/Makefile b/linux-2.4.30-xen-sparse/arch/xen/mm/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/mm/Makefile rename to linux-2.4.30-xen-sparse/arch/xen/mm/Makefile diff --git a/linux-2.4.29-xen-sparse/arch/xen/mm/fault.c b/linux-2.4.30-xen-sparse/arch/xen/mm/fault.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/mm/fault.c rename to linux-2.4.30-xen-sparse/arch/xen/mm/fault.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c b/linux-2.4.30-xen-sparse/arch/xen/mm/init.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/mm/init.c rename to linux-2.4.30-xen-sparse/arch/xen/mm/init.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/mm/ioremap.c b/linux-2.4.30-xen-sparse/arch/xen/mm/ioremap.c similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/mm/ioremap.c rename to linux-2.4.30-xen-sparse/arch/xen/mm/ioremap.c diff --git a/linux-2.4.29-xen-sparse/arch/xen/vmlinux.lds b/linux-2.4.30-xen-sparse/arch/xen/vmlinux.lds similarity index 100% rename from linux-2.4.29-xen-sparse/arch/xen/vmlinux.lds rename to linux-2.4.30-xen-sparse/arch/xen/vmlinux.lds diff --git a/linux-2.4.29-xen-sparse/drivers/block/ll_rw_blk.c b/linux-2.4.30-xen-sparse/drivers/block/ll_rw_blk.c similarity index 100% rename from linux-2.4.29-xen-sparse/drivers/block/ll_rw_blk.c rename to linux-2.4.30-xen-sparse/drivers/block/ll_rw_blk.c diff --git a/linux-2.4.29-xen-sparse/drivers/char/Makefile b/linux-2.4.30-xen-sparse/drivers/char/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/drivers/char/Makefile rename to linux-2.4.30-xen-sparse/drivers/char/Makefile diff --git a/linux-2.4.29-xen-sparse/drivers/char/mem.c b/linux-2.4.30-xen-sparse/drivers/char/mem.c similarity index 100% rename from linux-2.4.29-xen-sparse/drivers/char/mem.c rename to linux-2.4.30-xen-sparse/drivers/char/mem.c diff --git a/linux-2.4.29-xen-sparse/drivers/char/tty_io.c b/linux-2.4.30-xen-sparse/drivers/char/tty_io.c similarity index 100% rename from linux-2.4.29-xen-sparse/drivers/char/tty_io.c rename to linux-2.4.30-xen-sparse/drivers/char/tty_io.c diff --git a/linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile b/linux-2.4.30-xen-sparse/drivers/scsi/aic7xxx/Makefile similarity index 100% rename from linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile rename to linux-2.4.30-xen-sparse/drivers/scsi/aic7xxx/Makefile diff --git a/linux-2.4.29-xen-sparse/fs/exec.c b/linux-2.4.30-xen-sparse/fs/exec.c similarity index 100% rename from linux-2.4.29-xen-sparse/fs/exec.c rename to linux-2.4.30-xen-sparse/fs/exec.c diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/bugs.h b/linux-2.4.30-xen-sparse/include/asm-xen/bugs.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/bugs.h rename to linux-2.4.30-xen-sparse/include/asm-xen/bugs.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/desc.h b/linux-2.4.30-xen-sparse/include/asm-xen/desc.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/desc.h rename to linux-2.4.30-xen-sparse/include/asm-xen/desc.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/fixmap.h b/linux-2.4.30-xen-sparse/include/asm-xen/fixmap.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/fixmap.h rename to linux-2.4.30-xen-sparse/include/asm-xen/fixmap.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/highmem.h b/linux-2.4.30-xen-sparse/include/asm-xen/highmem.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/highmem.h rename to linux-2.4.30-xen-sparse/include/asm-xen/highmem.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/hw_irq.h b/linux-2.4.30-xen-sparse/include/asm-xen/hw_irq.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/hw_irq.h rename to linux-2.4.30-xen-sparse/include/asm-xen/hw_irq.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/io.h b/linux-2.4.30-xen-sparse/include/asm-xen/io.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/io.h rename to linux-2.4.30-xen-sparse/include/asm-xen/io.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/irq.h b/linux-2.4.30-xen-sparse/include/asm-xen/irq.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/irq.h rename to linux-2.4.30-xen-sparse/include/asm-xen/irq.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/keyboard.h b/linux-2.4.30-xen-sparse/include/asm-xen/keyboard.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/keyboard.h rename to linux-2.4.30-xen-sparse/include/asm-xen/keyboard.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/mmu_context.h b/linux-2.4.30-xen-sparse/include/asm-xen/mmu_context.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/mmu_context.h rename to linux-2.4.30-xen-sparse/include/asm-xen/mmu_context.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/module.h b/linux-2.4.30-xen-sparse/include/asm-xen/module.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/module.h rename to linux-2.4.30-xen-sparse/include/asm-xen/module.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/msr.h b/linux-2.4.30-xen-sparse/include/asm-xen/msr.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/msr.h rename to linux-2.4.30-xen-sparse/include/asm-xen/msr.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/page.h b/linux-2.4.30-xen-sparse/include/asm-xen/page.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/page.h rename to linux-2.4.30-xen-sparse/include/asm-xen/page.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/pci.h b/linux-2.4.30-xen-sparse/include/asm-xen/pci.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/pci.h rename to linux-2.4.30-xen-sparse/include/asm-xen/pci.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/pgalloc.h b/linux-2.4.30-xen-sparse/include/asm-xen/pgalloc.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/pgalloc.h rename to linux-2.4.30-xen-sparse/include/asm-xen/pgalloc.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/pgtable-2level.h b/linux-2.4.30-xen-sparse/include/asm-xen/pgtable-2level.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/pgtable-2level.h rename to linux-2.4.30-xen-sparse/include/asm-xen/pgtable-2level.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/pgtable.h b/linux-2.4.30-xen-sparse/include/asm-xen/pgtable.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/pgtable.h rename to linux-2.4.30-xen-sparse/include/asm-xen/pgtable.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/processor.h b/linux-2.4.30-xen-sparse/include/asm-xen/processor.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/processor.h rename to linux-2.4.30-xen-sparse/include/asm-xen/processor.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/queues.h b/linux-2.4.30-xen-sparse/include/asm-xen/queues.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/queues.h rename to linux-2.4.30-xen-sparse/include/asm-xen/queues.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/segment.h b/linux-2.4.30-xen-sparse/include/asm-xen/segment.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/segment.h rename to linux-2.4.30-xen-sparse/include/asm-xen/segment.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/smp.h b/linux-2.4.30-xen-sparse/include/asm-xen/smp.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/smp.h rename to linux-2.4.30-xen-sparse/include/asm-xen/smp.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/system.h b/linux-2.4.30-xen-sparse/include/asm-xen/system.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/system.h rename to linux-2.4.30-xen-sparse/include/asm-xen/system.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/vga.h b/linux-2.4.30-xen-sparse/include/asm-xen/vga.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/vga.h rename to linux-2.4.30-xen-sparse/include/asm-xen/vga.h diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/xor.h b/linux-2.4.30-xen-sparse/include/asm-xen/xor.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/asm-xen/xor.h rename to linux-2.4.30-xen-sparse/include/asm-xen/xor.h diff --git a/linux-2.4.29-xen-sparse/include/linux/blk.h b/linux-2.4.30-xen-sparse/include/linux/blk.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/linux/blk.h rename to linux-2.4.30-xen-sparse/include/linux/blk.h diff --git a/linux-2.4.29-xen-sparse/include/linux/highmem.h b/linux-2.4.30-xen-sparse/include/linux/highmem.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/linux/highmem.h rename to linux-2.4.30-xen-sparse/include/linux/highmem.h diff --git a/linux-2.4.29-xen-sparse/include/linux/irq.h b/linux-2.4.30-xen-sparse/include/linux/irq.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/linux/irq.h rename to linux-2.4.30-xen-sparse/include/linux/irq.h diff --git a/linux-2.4.29-xen-sparse/include/linux/mm.h b/linux-2.4.30-xen-sparse/include/linux/mm.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/linux/mm.h rename to linux-2.4.30-xen-sparse/include/linux/mm.h diff --git a/linux-2.4.29-xen-sparse/include/linux/sched.h b/linux-2.4.30-xen-sparse/include/linux/sched.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/linux/sched.h rename to linux-2.4.30-xen-sparse/include/linux/sched.h diff --git a/linux-2.4.29-xen-sparse/include/linux/skbuff.h b/linux-2.4.30-xen-sparse/include/linux/skbuff.h similarity index 99% rename from linux-2.4.29-xen-sparse/include/linux/skbuff.h rename to linux-2.4.30-xen-sparse/include/linux/skbuff.h index 32ba0f8cd0..c9a0e3b5e1 100644 --- a/linux-2.4.29-xen-sparse/include/linux/skbuff.h +++ b/linux-2.4.30-xen-sparse/include/linux/skbuff.h @@ -291,15 +291,11 @@ static inline struct sk_buff *skb_get(struct sk_buff *skb) static inline void kfree_skb(struct sk_buff *skb) { - if (atomic_read(&skb->users) == 1 || atomic_dec_and_test(&skb->users)) - __kfree_skb(skb); -} - -/* Use this if you didn't touch the skb state [for fast switching] */ -static inline void kfree_skb_fast(struct sk_buff *skb) -{ - if (atomic_read(&skb->users) == 1 || atomic_dec_and_test(&skb->users)) - kfree_skbmem(skb); + if (likely(atomic_read(&skb->users) == 1)) + smp_rmb(); + else if (likely(!atomic_dec_and_test(&skb->users))) + return; + __kfree_skb(skb); } /** diff --git a/linux-2.4.29-xen-sparse/include/linux/timer.h b/linux-2.4.30-xen-sparse/include/linux/timer.h similarity index 100% rename from linux-2.4.29-xen-sparse/include/linux/timer.h rename to linux-2.4.30-xen-sparse/include/linux/timer.h diff --git a/linux-2.4.29-xen-sparse/kernel/time.c b/linux-2.4.30-xen-sparse/kernel/time.c similarity index 100% rename from linux-2.4.29-xen-sparse/kernel/time.c rename to linux-2.4.30-xen-sparse/kernel/time.c diff --git a/linux-2.4.29-xen-sparse/kernel/timer.c b/linux-2.4.30-xen-sparse/kernel/timer.c similarity index 100% rename from linux-2.4.29-xen-sparse/kernel/timer.c rename to linux-2.4.30-xen-sparse/kernel/timer.c diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.30-xen-sparse/mkbuildtree similarity index 100% rename from linux-2.4.29-xen-sparse/mkbuildtree rename to linux-2.4.30-xen-sparse/mkbuildtree diff --git a/linux-2.4.29-xen-sparse/mm/highmem.c b/linux-2.4.30-xen-sparse/mm/highmem.c similarity index 100% rename from linux-2.4.29-xen-sparse/mm/highmem.c rename to linux-2.4.30-xen-sparse/mm/highmem.c diff --git a/linux-2.4.29-xen-sparse/mm/memory.c b/linux-2.4.30-xen-sparse/mm/memory.c similarity index 99% rename from linux-2.4.29-xen-sparse/mm/memory.c rename to linux-2.4.30-xen-sparse/mm/memory.c index 1ae2a42988..8f61e6657a 100644 --- a/linux-2.4.29-xen-sparse/mm/memory.c +++ b/linux-2.4.30-xen-sparse/mm/memory.c @@ -502,9 +502,11 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long /* FIXME: call the correct function, * depending on the type of the found page */ - if (!pages[i]) - goto bad_page; - page_cache_get(pages[i]); + if (!pages[i] || PageReserved(pages[i])) { + if (pages[i] != ZERO_PAGE(start)) + goto bad_page; + } else + page_cache_get(pages[i]); } if (vmas) vmas[i] = vma; diff --git a/linux-2.4.29-xen-sparse/mm/mprotect.c b/linux-2.4.30-xen-sparse/mm/mprotect.c similarity index 100% rename from linux-2.4.29-xen-sparse/mm/mprotect.c rename to linux-2.4.30-xen-sparse/mm/mprotect.c diff --git a/linux-2.4.29-xen-sparse/mm/mremap.c b/linux-2.4.30-xen-sparse/mm/mremap.c similarity index 100% rename from linux-2.4.29-xen-sparse/mm/mremap.c rename to linux-2.4.30-xen-sparse/mm/mremap.c diff --git a/linux-2.4.29-xen-sparse/mm/page_alloc.c b/linux-2.4.30-xen-sparse/mm/page_alloc.c similarity index 99% rename from linux-2.4.29-xen-sparse/mm/page_alloc.c rename to linux-2.4.30-xen-sparse/mm/page_alloc.c index 621b209a87..928433b8df 100644 --- a/linux-2.4.29-xen-sparse/mm/page_alloc.c +++ b/linux-2.4.30-xen-sparse/mm/page_alloc.c @@ -554,7 +554,7 @@ unsigned int nr_free_buffer_pages (void) class_idx = zone_idx(zone); sum += zone->nr_cache_pages; - for (zone = pgdat->node_zones; zone < pgdat->node_zones + MAX_NR_ZONES; zone++) { + for (; zone; zone = *zonep++) { int free = zone->free_pages - zone->watermarks[class_idx].high; if (free <= 0) continue; diff --git a/linux-2.4.29-xen-sparse/mm/swapfile.c b/linux-2.4.30-xen-sparse/mm/swapfile.c similarity index 99% rename from linux-2.4.29-xen-sparse/mm/swapfile.c rename to linux-2.4.30-xen-sparse/mm/swapfile.c index 6457f19b74..26d4aa4f67 100644 --- a/linux-2.4.29-xen-sparse/mm/swapfile.c +++ b/linux-2.4.30-xen-sparse/mm/swapfile.c @@ -739,8 +739,10 @@ asmlinkage long sys_swapoff(const char * specialfile) for (type = swap_list.head; type >= 0; type = swap_info[type].next) { p = swap_info + type; if ((p->flags & SWP_WRITEOK) == SWP_WRITEOK) { - if (p->swap_file == nd.dentry) - break; + if (p->swap_file == nd.dentry || + (S_ISBLK(nd.dentry->d_inode->i_mode) && + p->swap_device == nd.dentry->d_inode->i_rdev)) + break; } prev = type; } diff --git a/linux-2.4.29-xen-sparse/mm/vmalloc.c b/linux-2.4.30-xen-sparse/mm/vmalloc.c similarity index 100% rename from linux-2.4.29-xen-sparse/mm/vmalloc.c rename to linux-2.4.30-xen-sparse/mm/vmalloc.c diff --git a/linux-2.4.29-xen-sparse/net/core/skbuff.c b/linux-2.4.30-xen-sparse/net/core/skbuff.c similarity index 100% rename from linux-2.4.29-xen-sparse/net/core/skbuff.c rename to linux-2.4.30-xen-sparse/net/core/skbuff.c -- 2.30.2